From fb291194e1a4efa9d7a4bede8441c4ea719f1e2b Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=B8ren=20Sandmann=20Pedersen?= Date: Fri, 22 Feb 2002 13:35:03 +0000 Subject: [PATCH] remove conflict marker --- ChangeLog | 1 - ChangeLog.pre-2-0 | 1 - ChangeLog.pre-2-10 | 1 - ChangeLog.pre-2-2 | 1 - ChangeLog.pre-2-4 | 1 - ChangeLog.pre-2-6 | 1 - ChangeLog.pre-2-8 | 1 - 7 files changed, 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index ca4c76331b..132df9cdaa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -39,7 +39,6 @@ Thu Feb 21 16:51:17 2002 Owen Taylor * gtk/gtkmenushell.c (gtk_menu_shell_key_press): Use _gtk_window_activate_key(), gtk_bindings_activate_event(). ->>>>>>> 1.3066 Thu Feb 21 12:24:22 2002 Owen Taylor * gtk/gtkctree.c (gtk_ctree_class_init): Remove some workarounds diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index ca4c76331b..132df9cdaa 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -39,7 +39,6 @@ Thu Feb 21 16:51:17 2002 Owen Taylor * gtk/gtkmenushell.c (gtk_menu_shell_key_press): Use _gtk_window_activate_key(), gtk_bindings_activate_event(). ->>>>>>> 1.3066 Thu Feb 21 12:24:22 2002 Owen Taylor * gtk/gtkctree.c (gtk_ctree_class_init): Remove some workarounds diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index ca4c76331b..132df9cdaa 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -39,7 +39,6 @@ Thu Feb 21 16:51:17 2002 Owen Taylor * gtk/gtkmenushell.c (gtk_menu_shell_key_press): Use _gtk_window_activate_key(), gtk_bindings_activate_event(). ->>>>>>> 1.3066 Thu Feb 21 12:24:22 2002 Owen Taylor * gtk/gtkctree.c (gtk_ctree_class_init): Remove some workarounds diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index ca4c76331b..132df9cdaa 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -39,7 +39,6 @@ Thu Feb 21 16:51:17 2002 Owen Taylor * gtk/gtkmenushell.c (gtk_menu_shell_key_press): Use _gtk_window_activate_key(), gtk_bindings_activate_event(). ->>>>>>> 1.3066 Thu Feb 21 12:24:22 2002 Owen Taylor * gtk/gtkctree.c (gtk_ctree_class_init): Remove some workarounds diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index ca4c76331b..132df9cdaa 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -39,7 +39,6 @@ Thu Feb 21 16:51:17 2002 Owen Taylor * gtk/gtkmenushell.c (gtk_menu_shell_key_press): Use _gtk_window_activate_key(), gtk_bindings_activate_event(). ->>>>>>> 1.3066 Thu Feb 21 12:24:22 2002 Owen Taylor * gtk/gtkctree.c (gtk_ctree_class_init): Remove some workarounds diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index ca4c76331b..132df9cdaa 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -39,7 +39,6 @@ Thu Feb 21 16:51:17 2002 Owen Taylor * gtk/gtkmenushell.c (gtk_menu_shell_key_press): Use _gtk_window_activate_key(), gtk_bindings_activate_event(). ->>>>>>> 1.3066 Thu Feb 21 12:24:22 2002 Owen Taylor * gtk/gtkctree.c (gtk_ctree_class_init): Remove some workarounds diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index ca4c76331b..132df9cdaa 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -39,7 +39,6 @@ Thu Feb 21 16:51:17 2002 Owen Taylor * gtk/gtkmenushell.c (gtk_menu_shell_key_press): Use _gtk_window_activate_key(), gtk_bindings_activate_event(). ->>>>>>> 1.3066 Thu Feb 21 12:24:22 2002 Owen Taylor * gtk/gtkctree.c (gtk_ctree_class_init): Remove some workarounds -- 2.30.2